am f7adf880: Reconcile with jb-release

* commit 'f7adf880264f57786bd33b3f8bb2395bd236b0bf':