Reconcile with jb-release

Change-Id: I68d329b7abda2aedfd3fd98419f3b3167ccfbc2a