Merge d953f415c254ed4eb71d34b3b2b2af034bf9e846 on remote branch

Change-Id: If4c352788cafac0f2fcad53ad7fedbeac3567951