435.22 back-porting changes from G2 build 47.07; work on NAN cases for persisted data. Fixes OMC probing.