Merge e5bed124a02eebf75501c03616744f4210e45a46 on remote branch

Change-Id: I5528b0e491d16d95214971396fbc7766a13e47a8