Merge b580256d8f2c84a171c12ddbca3f8932165f0484 on remote branch

Change-Id: Ie0a61b8cd0e7558791a353a554e9aeda87f7d297