am 1738f4ae: Reconcile with jb-release

* commit '1738f4ae9bb28740f8bcb49915601d0429f5d0b6':