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

Change-Id: Iab96df1946b1b94645b5e9f99a5bb37178987944