Merge 9502e7912896f01d91a242b82120caaa30d3b950 on remote branch

Change-Id: Id72eb2a213558515700de0ed52fb175322c741f4