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

Change-Id: I7d22fa6b33c4e77725ae40de89fa6d83be4e8551