am 5dccb9a4: Reconcile with jb-release

* commit '5dccb9a416bf5171805140b9b09e589a5367408f':