Merge 6a6ac244c37ff29d42b1a6ada1d6cf4a46ae220c on remote branch

Change-Id: I6cd96c1ac69b1b3758d65bba21d9b7c3278c989d