Merge 0ec934a6c3e998e4a8a13afac1bb7d5c6bb7862d on remote branch

Change-Id: Ib948e7d1d02c9483cdbf561f3a7488963b30a756