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

Change-Id: I0895e30de170b9b316fb416732d6f88ce16cfc72