Merge 7a0823a3f021a4ba8d372981e615358667f7961d on remote branch

Change-Id: Ibba0f82728487a84c14ab7bc63d0bd9ba5c676d9