Reconcile with ics-factoryrom-release

Change-Id: I445a06a1c4486a76a9278c2ab57415cd902f8927