Merge 26b2501fb918845db2ad7f41b0d768bb12f107a2 on remote branch

Change-Id: Ib019482aff95c88e5c33f290fa4b56d14911de51