Merge b602aaddc3bca18ac0b161769606b1322639c8d1 on remote branch

Change-Id: I5a80cd4a371cd9cb861075fcdfaca5df891b43ef