Merge 10b4922dcde8efae99b92debd205bddff0f3d909 on remote branch

Change-Id: Ib3c12488c0cca7336fad937766370ac08fdeea6a