Reconcile with ics-mr1-release

Change-Id: Ie299bdc69639bde826652cf5da7b7826161b787e