Reconcile with jb-release

Change-Id: I7cea6b7dd25e75e4b0a738cfa890fcaa556c2d0b