Reconcile with ics-mr0-release ics-factoryrom-2-release

Change-Id: Ia7bf3982d1a8fe4e1a5c458849250c38f65a6d50