am 51d33db0: Reconcile with jb-release

* commit '51d33db0f1f190110824b03a2ee6dda07b99ecaf':