am a201914b: Reconcile with ics-mr1-release

* commit 'a201914b3b2f6910b4ce4d58a4f170d9ebaeb174':