Merge 0b6ec98b4500f5904a1ab82c49a66051e501e7d1 on remote branch

Change-Id: I6869cdc5655da8c99a31429e554b5a61784151e7