am 99565a9e: Reconcile with jb-release

* commit '99565a9e80882658e1b4ea5b7c610d40d4d7cb0b':