Reconcile with jb-release - do not merge

Change-Id: I89dbc5ee1f1765f334f5dd5d1feb7c05a7d9360f