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

Change-Id: I9fe682604981ae07715422637fc4629d7e09937f