Merge da587c1c6162337ed5a9c61be6404f588555dce9 on remote branch

Change-Id: I85fbac14e1f59c723c57c551a088faf53a5e1ce2