Merge c9de0a84fe765faa2e8ca08f05eb8bd12c8e7f6b on remote branch

Change-Id: I782a5b342bfad1672f571c36e7bb214dc485884d