Merge e887552c140b1d1281740b427a72223dbce83c1f on remote branch

Change-Id: Ifccd2a424a76557e79c4c1264f8a17b964bdedb6