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

Change-Id: I9864de7c2785357cea0c4b669607fee76e9f09e8