Merge d45ccf44ea98581b5642e3a35c060ca30bb2c3cb on remote branch

Change-Id: I5f88d204729fd973e33b6570c04ed25bb84c6a91