am 66ce1fce: Merge "Removing changes not meant for MR1" into ics-mr1

* commit '66ce1fce59d2dc16f1905120e0fe3851ba1add90':
  Removing changes not meant for MR1