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

Change-Id: I914272e7b65b9b792f8d71f0654ab156fdbef452