Merge de69dae2ce989aa504f723e03b5ce3f341e2cf1f on remote branch

Change-Id: Iac0adba387a1ecadd78eaa536c376c512248a45b