Merge da0673916df5cce41eb26bbf65ff9f7f52e6ce3b on remote branch

Change-Id: I066f7194212769f16260913a290b53d6a6da5134