Reconcile with jb-release

Change-Id: I69dba4095800bcb6f871deac3115592a53717a3c