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

Change-Id: I5a0af2cc544c873654fb328b96b0bf1eed32d4ef