am 1d1b78da: Reconcile with jb-release

* commit '1d1b78daa78a67760247247021e082e36b856c3a':