[automerger skipped] DO NOT MERGE Add data integrity checking for wifi passwords
am: 83b6df4c7e -s ours
am skip reason: subject contains skip directive

Change-Id: I0895e30de170b9b316fb416732d6f88ce16cfc72
tree: 9b78d7d399ae70cb479ab36997332b1db4e555f5
  1. service/
  2. PREUPLOAD.cfg