Merge de3bead339a8241185e1afadc8ac0ce6ee5b69e9 on remote branch

Change-Id: Ie90c217e5cc357c2a100065f2cb84d64e0fd6492