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

Change-Id: Ib2d247987e12acb692ade4862ebe200585bb4664