Merge 04a1db58cd9f6a85b394c81e10ba6bd4d0bfdc89 on remote branch

Change-Id: Ib3d471eec4efe357ccba154f8ea5a9bd1dd8ae18