Reconcile with jb-release

Change-Id: I310d0ebe5267d9e6915ffa4ea1a629fda57dd53a