Merge a91524de323ece53a33cb69004360fa52d4e1bd6 on remote branch

Change-Id: I7ed603a4b13b19913d8ce82599364b3cae750c76