Merge 18384ed05fa19dd0f9acb3b2822dc299b227b926 on remote branch

Change-Id: I38730224ccf29677a0c2bd62b67b6b26f9ba83fe