Merge commit '0b62b1059b9dff082745dacec6cc1e6cc6b1bb6b' into HEAD Change-Id: Ife32dbe449462e1028db9aafe5880e005a2fa6cc