am 7691772c: Reconcile with jb-release

* commit '7691772c14f7f2f632b04b8149e4b96d5cae3b67':