am 939532e0: am 80dec847: Merge "Cherry-picking I25bf497e for MR1" into ics-mr1

* commit '939532e04299bf6390b58a340fac5f0293dd9a73':
  Cherry-picking I25bf497e for MR1