[automerger skipped] Revert "DO NOT MERGE Add data integrity checking for wifi passwords" am: e1e57e88bc
am: 8d8f873ed8 -s ours
am skip reason: subject contains skip directive

Change-Id: I28172adccf7710789918154f77b8a6820da5cfee
tree: aac61f760b2dae1a26b5b7a9e768d5ee9ee64441
  1. service/
  2. PREUPLOAD.cfg