Merge 97b482b1ab292b01367a81ff4e3568869fd42971 on remote branch

Change-Id: Ieab543e8bbcf6a67b75d94e87860ec9a24bafc9f