am 95e19b22: Reconcile with jb-release

* commit '95e19b22cfcaae45000a91dfdf89801ddaf5252a':