am 43ae5df9: Reconcile with jb-release

* commit '43ae5df9bc47c97dbfdea4cb8042cb3f048ad088':