Reconcile with jb-release

Change-Id: I75e5174aabe8e3fd3c1963045c2db6f7db9fc08d