Merge 42ac643a9f12d05c266d614cc945f952ef316688 on remote branch

Change-Id: Iad65f730b775c86687fdd94822a2faf34661c326