[automerger skipped] Merge "Fix the potential NPE when starting provisioning...
[automerger skipped] Merge "Fix the potential NPE when starting provisioning with FILS." into rvc-dev am: db6652aa -s ours am: 1fb22fa7 -s ours
am skip reason: Change-Id I3c29c6ad95c23cea2b3f374fb9dc35a8f54a6427 with SHA-1 1eb4c9d5 is in history
Change-Id: Id0fb3bcb2e31a65aaac9d3acdb19b9086610204c