Merge 9b8b4e1cd3064bacc34d15429e712f338afce438 on remote branch

Change-Id: I47094870fec5d606fa5bd5c0667332b7619e2e83