Merge b721d6e6b88937ab6cdd8486de677a6c91cf4888 on remote branch

Change-Id: I7c627262e005d0e7a6029485cf5405d34618f37e