am 85bce905: Reconcile with jb-release

* commit '85bce905b47b37f07d0b0210d5b128092ca1862d':