Merge 0b0756511c6cb313847a88e61959ecbf1862a10f on remote branch

Change-Id: I11db8860ec52db9710522720a91edd9d225862b4