Reconcile with jb-release

Change-Id: I7cbfbab55783f245c0854543843c2052c4c2e932