Merge eda0c8e07ae861d8849f6e3546ad891e6b98c178 on remote branch

Change-Id: I12bf789d3e44d4e6f479ef91b70b50c658aa9524