Merge 346468d572df78d56fa0c37da11882bb39c713c3 on remote branch

Change-Id: Iaedf2dbfd70ab13f3c86c946438e39719efd0790