am 4f14d40c: Reconcile with jb-release

* commit '4f14d40cef4b0cfedc94de65a46f4bb08587ead4':