am f5260299: Reconcile with jb-release

* commit 'f5260299afcb6f2424ca4986513373c82d973e84':