am bb465da6: Reconcile with jb-release

* commit 'bb465da6b00259e4da760046a675d6bac276ea7e':