Merge f1eedc99d582cde3352c804a89f697ece1453f1c on remote branch

Change-Id: I77b20a1579bb8d1ac4d225b6c6aa626b4aeaa76f