am 99912695: Reconcile with jb-release

* commit '99912695a49365b7caa3586656e8fa68eb0bcd33':