Merge 54a0dafc7854d78eb4e2731f8bb534470e25947a on remote branch

Change-Id: I29f9ee65e619bea95b6a71e184f1e121c8361816