am 411b853a: Reconcile with jb-release

* commit '411b853adfa971ca58c7cb6ac1896206085814e6':