Merge 7ec7e2e43e3a9a4a89eb089b2b0adbd6a480b4d8 on remote branch

Change-Id: I0f6309b161bebdf8aaa3df3dde7c57ae7ded8f7d