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

Change-Id: I0dea6d4a409899be3ba89212b1c269f61db4b453