Reconcile with jb-release

Change-Id: I0e57086cc66800b7de474af735ebd7ee896e6a25