Merge c8bc856bfa6ab11ae578d10ff0d061911bd6fa32 on remote branch

Change-Id: Ia62fd9a6f2615dd0805ded38b053fb393a0220e1