Reconcile with jb-release

Change-Id: I422adc54841a9693fe9cf81b488dd8817251328b