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

Change-Id: I84e2f72513f3087ff4628a838efcf471e3695934