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

Change-Id: I48e936434971feedd176c2d5eafd0fdf43b75f74