am ffb82943: Reconcile with jb-release

* commit 'ffb829430ff20ccd6c13e6ed894f2373b2d93939':