Merge 8145c1c31045cc584f839ea9e809cffcadbf7879 on remote branch

Change-Id: Ic6ff701eeb1f80aa47833cb74a02d63e662c2cae