am 0f5411b2: Reconcile with jb-release

* commit '0f5411b28f0e23585348ce574c133027f5ce3d36':