Merge 5739c44a4aae7dbaf32e4ee2238b0fd59f8c68a2 on remote branch

Change-Id: I8e9d503c8e65695b994b0456b025d56cc7103990