Merge 0a8e64fc85c07897087c32b41f445b22bf21f32f on remote branch

Change-Id: I5a1e7542da343f1a647841447474bbc97d8cb4f6