Merge 6736d7af0b6cf2eeb3970571c912bfcd9f17f8c1 on remote branch

Change-Id: Ibeb6b8db58b0efc044bec3e8475b76650a74ed40