am 2f86b16c: Reconcile with jb-release

* commit '2f86b16c35b4c18dc0fb9ed8770558bfd09615ab':