am 88630509: Reconcile with jb-release

* commit '886305097c20c603cd4ecf979405e1fe36da1f1e':