Merge 27f55fafd25184d4b28cb1f164b67167bf4154a2 on remote branch

Change-Id: Ieb31833cdce018be5635316b17354309afe35867