am 9ba16e8d: Reconcile with jb-release

* commit '9ba16e8dd1107646ef408b051572eed241831c74':