am c31a0898: Reconcile with jb-release

* commit 'c31a0898275384a6c87f0c483ee1c8f357c78472':