am b062b0a8: Reconcile with ics-factoryrom-release

* commit 'b062b0a860b7b94d5e2764c7a43b663ded30db45':