am 8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0

* commit '8d8e669ea11d011b3e2320ad5dab580916b6d32e':
  DO NOT MERGE cherry picking from MR0 cl 148223