Merge e6e048921317ca26f4fc43f7a60ec6b9ad2f99ed on remote branch

Change-Id: Id69165683df1a2cb4515bed2ec43168cab8eabef