Merge c43c4889751680ba2c9d4aa67d0807d4628d31a1 on remote branch

Change-Id: I37e53b9177998801acd4566dbd3c30f7dfd8e372