Reconcile with jb-release

Change-Id: I60294fb5c41ef34eccc322889168497d9449c6ea