Merge 6cb97e8e87449c5272fe5f32de5502b4f0244c8a on remote branch

Change-Id: I974c29d16bdeceada3a87e087711054c78bc6928