am 38b03618: Reconcile with jb-release

* commit '38b03618762a657d168a06c16e07bdc747d75170':