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

* commit '22769993a1e8511af84c49161c0f032475023a48':
  Cherry-picking I25bf497e for MR1