Merge acd6f4d3ed77839edd8b82737a4fd9f543c5679b on remote branch

Change-Id: I17b0cb55632d49fbc63e3f026e41142aaaa5cfa8