Reconcile with jb-release - do not merge

Change-Id: I74a36d0a79723c656b50f36c1d96042e50a0c943