am ff8977f3: Reconcile with jb-release

* commit 'ff8977f3392036b387fc2f65056bcf19f9942c9d':