Merge ddea40bf90949bc6a8560fa026829f2e60ccaa88 on remote branch

Change-Id: I1583734d85a5e40ac502ef86074b5521dc3dd0b9