[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: 206068fa -s ours am: b23838e6 -s ours

am skip reason: Change-Id I3c29c6ad95c23cea2b3f374fb9dc35a8f54a6427 with SHA-1 1eb4c9d5 is in history

Change-Id: I25a8c7ef9549e5c8160e6312d9d346fbb5d8734c