Merge d45ccf44ea98581b5642e3a35c060ca30bb2c3cb on remote branch

Change-Id: I8f9ca2a14663733f70cc4a6d18507991a55ca843