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

Change-Id: I933252f3cee48c449df3ea2493e16d8652723ffc