am f6939b1f: am 1d4afec2: am 6b071c38: Reconcile with jb-release

* commit 'f6939b1f01c0ecaf6a537b8e77397d7a5ce60814':