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

Change-Id: I38129dc3a8a50f254dbe8155736f45f247deb1af