Merge c3b0b80d5ab78cf61149cb1e6c9274fbe3769f7a on remote branch

Change-Id: I173330dbf5e6858004f0945f250331150d798b6e