Reconcile with jb-release

Change-Id: I99645be9bd73a07efdbb60669775c6f38887dded