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

Change-Id: Ic39646ef7cada28af9b9fbccbc8b6e563be7b232