am 7afcf632: Reconcile with jb-release

* commit '7afcf63296319d2d4b9ca716e05f329a6e0e3b34':