Merge 0ac17f21df64a087f9c817535b02e620bd9775e0 on remote branch

Change-Id: I04342e12f672c4835a39fd46399e0216c26415a1