Reconcile with jb-release - do not merge

Change-Id: I992c5faa8c3ba8978acfbf59f3f19fa2aef07ca3