am e33f810a: Reconcile with ics-factoryrom-release

* commit 'e33f810a19d5db5b5c5a67eceeb12a5bc1a51b09':