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

Change-Id: I03f18d4939d298225e8954dfff6dc9cdbe71b8c7