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

Change-Id: Id93477c002befa42eda6aafe3a71323e28ca8ab0