am 97d59168: Reconcile with jb-release

* commit '97d59168955c9fd0161b68153dc5b226fc3a5bee':