Reconcile with jb-release

Change-Id: If4bd1eb313b2913600b502719de864b2153f5e02