Merge ef8efa02028b2b8d1d18f2dc94e931038a91c539 on remote branch

Change-Id: I829ead39f47838f3ade530f0192d86f4fe37db58