Merge f0d246e9a17a83eb9e69815c419aff6c5953107f on remote branch

Change-Id: I2835d5ac0a9f1eca3788ff7df2be1a131aabaf45