am abc8c319: Reconcile with jb-release

* commit 'abc8c319c1fe82b79a43c2ae76a42db467e1cf92':