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

Change-Id: Iec182c2d033032f8583a369269eda62086ea35be