Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I87a7986866714bfd922259cf961d6d5f5b752362