Merge b2954bd50e211a7e80b9fa40f0e5959cb825a7ac on remote branch

Change-Id: I88470ec441528c4eaade89576377089c02e09d0f