Merge 479523e36dba634858fef7e50e77f4ce3f14b9b4 on remote branch

Change-Id: I82c2f2f8e03f2e483282df91b10c0ada96625832