Reconcile with ics-mr1-release

Change-Id: Ie33aa6b1f03109ba09b50dc5e04d5930d947d809