DO NOT MERGE Add data integrity checking for wifi passwords
am: fe21aeee56

Change-Id: I693494586fbee73fb749f66214ecdc7c79f286d5