Reconcile with jb-release - do not merge

Change-Id: Ica5beb67763852c66e2b777e6acb2216bcc1a32a