am 6b071c38: Reconcile with jb-release

* commit '6b071c38cda21c679c18310a823c17dad32e8ea1':