Merge c280c83d5aa4e303b36f9ed422d901a4cd0d9da4 on remote branch

Change-Id: If68d061d72ee970fffca4fd7117479b20898848a