Merge 904342b6e26dc34cd901c71ea03c5c66c304095f on remote branch

Change-Id: I4938b96427f0a3727f0094dfaec024063594bc52