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

Change-Id: Idb5a744d6c6b32af8a23f2e891e5d680a78877cc