Reconcile with jb-release

Change-Id: I8d723033a1d479bd9ef5973cb098b488c54c6c62