am effc607e: Reconcile with jb-release

* commit 'effc607e87add0aec14fefb4ac1c00d36559149a':