Merge 7b62b1db05bc60f88df81d49e23698abf474162c on remote branch

Change-Id: I72dd96346458e7f9eaba2302da9f0c60f061cfe1