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

Change-Id: I47fca5203adfc0e37cd63bcc6454c9cc79abc54b