Merge 50998c815ffdcd4f80a91c6223843caf00663a97 on remote branch

Change-Id: Ia162caebc1b97a7d4cf91a0b81beb799619b2b30