Merge 6120ec07623a2ea44ab5af6861b703d1f785cf48 on remote branch

Change-Id: I646edd2ea730cccb00989cdca87b20edd30a3ee2