am 2a7e29a4: Reconcile with jb-release

* commit '2a7e29a49148e428f32576a65efffc91f6332bfe':