am 2177c79b: Reconcile with jb-release

* commit '2177c79bddc66e295599d87007d4cbec549e1cac':