Merge acd6f4d3ed77839edd8b82737a4fd9f543c5679b on remote branch

Change-Id: I1e9b33c8348bc69454557ff6a0f9d4652a8cce14