Snap for 12305878 from d3ca465768b7ccb170cab1f42ad08c3a1ed191d1 to 25D4-release

Change-Id: I210029dc8011072906414e287396ece7aa5e7827