Merge 180cef79239f969f1e40ecd2c370fd34bc727623 on remote branch

Change-Id: Icb3377f613f99f1b93a6483ea2c3f785e2cae996