am c411fd2f: Reconcile with jb-release

* commit 'c411fd2f784e83053f5e7e9c65342d0cc838bc6e':