Merge 97b482b1ab292b01367a81ff4e3568869fd42971 on remote branch

Change-Id: I121928040c9bdecc00412506e3d4b41cca1e279a