am 06c2bf57: Reconcile with jb-release

* commit '06c2bf575b070bd47f0874155d9cfacba2538747':