Merge 7747571d1663e6b8493a320c5e97ff721ec3a9d7 on remote branch

Change-Id: Ic05f1c22a996d10b5530c08ec4f9b0d666ba2d22