am 62f4d9d3: Reconcile with jb-release

* commit '62f4d9d3a3570aaa24e768a49c48dfb272d70838':