Reconcile with jb-release

Change-Id: Ib0777e5e7794dec80266a4c25946b267d316f527