Merge 61d0ac55a249f9bbb20170e3eaa0d8134854d7d2 on remote branch

Change-Id: Id2f0dc69fcfaad241919208f8a46317ff3394373