Merge "Erase modem config on factoryReset" am: 67a0df4484
am: 98a869421a

Change-Id: Iefd841f038b32235ccf55893539e78e203a63249