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

Change-Id: Id9419bf573d550f1ebebcc96fe615e1aaf8f36ef