am 47fd20aa: Reconcile with jb-release

* commit '47fd20aa12ca0117cb3b958f88e440b151915d5d':