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

Change-Id: I7100db02d39d7d91bb3c2b8eea070a48a8f7c139