am 14b961f6: Reconcile with jb-release

* commit '14b961f6ef4ab2177765c3e64676f0735d934158':