am d96544ff: Reconcile with jb-release

* commit 'd96544ff69601fe2990245e10e054480f0bd341f':