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

Change-Id: I8dbb751759f10ec2d0dc69bd2e12104df939da83