Merge b721d6e6b88937ab6cdd8486de677a6c91cf4888 on remote branch

Change-Id: I3efd942cb4f87994642cc45672ccc0da3c57b39b