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

Change-Id: I80cacfe6593b8595da9df2827790fc763c1a25ee