Merge 61c4bb480514e2d1a4e4e7e6e082f8b934afdec4 on remote branch

Change-Id: Iec71571f331763ee43824eb2912169b6b8fd6406