Reconcile with ics-mr0-release

Change-Id: I5677e93901f03f4c4ae9bf08e6acec3b1d9223bf