am 4761677e: Reconcile with jb-release

* commit '4761677ea28182b70d9456d1641b3c2e87e23ca0':