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

Change-Id: Id19e45c1de96766e22fa6e721c864214ba233fd6