Merge 59fdc4789885d5bf0c1b0dbd2393468dccde9e67 on remote branch

Change-Id: I731ce90d0fb755630af3bfb1f34fdad8d9980d60