Merge a83d8bb1533a85354ed76be1970f6242d49dd744 on remote branch

Change-Id: Ib0f764f69154d243dd3b135ed99944527bc7316b