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

Change-Id: I7a4acfcda9accd3f6b9a1203f543c86a287d8039