Reconcile with jb-release

Change-Id: Ib5a40ba42a95be1f39b6135ce5888741234ce15c