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

* commit '80dec847e1950cb78899877f66a6d56c1a8b9672':
  Cherry-picking I25bf497e for MR1