am 36513574: Reconcile with jb-release

* commit '3651357441c0287c64dddfc57d307db1f4034f1d':