am 216c29ec: Reconcile with jb-release

* commit '216c29ec51de9616264a1e9ee3dd5ac840701d03':