Merge fe3aa5e0ce7cd017c244dbc4b279d670601992ce on remote branch

Change-Id: Ic3e74b5a3dad263ff990bbc895f4ad1cfbb6110d