Reconcile with jb-release - do not merge

Change-Id: Iac015880fd7dbb0dd4a55a8dbacae37d55981e8b