Merge a643b03919e9312caecf6a55fb6d64cdd70020c4 on remote branch

Change-Id: I61269578a97c83808ae3a042395dadef1bb208f2