Reconcile with ics-mr1-release

Change-Id: I23b44019be484abd8005ca85125ad9da00e0637a