Merge 92805e32c8e9866dce72b2e22a358ded68648a61 on remote branch

Change-Id: Ic83938d805f24bac2ab8fa8a733fd5ef50f98f7c