Merge e3cdfddb01d7c9aa0bdd3ae1597b3c1b1457b7e2 on remote branch

Change-Id: Id6c3e1acdc59d41be4f6242892dc3e3d61d27935