Merge 5a78a2def64786bef5c2bbe33d8dc02d3d9046f5 on remote branch

Change-Id: I4c93b2aedfc05e96a63d1df0213a123a1c7a345b