Merge "[automerger skipped] Merge "Wipe the data in IpMemoryStore database...

Merge "[automerger skipped] Merge "Wipe the data in IpMemoryStore database upon network factory reset." into qt-dev am: 358c2b33f3 am: 3e21934d65 -s ours
am: 6015a9de28 -s ours
am skip reason: change_id I13ad04454e638905b74dd42a1c83266c7c37652f with SHA1 29f6cdcd42 is in history

Change-Id: I93e6b13d2a01dcdec99c6baba810857ffab4ebbe