am 976643f7: Reconcile with jb-release

* commit '976643f72db71a82b6d27d356bb30e4e1cd64504':