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

Change-Id: Ib1fa3361941e032e0ff6137b37ef14eee2e794b2