Merge e7cb79c20c2e34e5f15b9d8eca10783158565995 on remote branch

Change-Id: I9569b841bdb01786f0712155898b9029a8a507e6