am de9d2fb6: Reconcile with jb-release

* commit 'de9d2fb699bd5162a66910e68db989a7bad0575b':