Merge 3ebe361c6349c9fe535d719ee7f7bd3d37770837 on remote branch

Change-Id: I0313bbef060fdd555257ceaf9a186c0a10153897