[automerger skipped] Merge "Add a factoryReset method to IIpMemoryStore, and...
[automerger skipped] Merge "Add a factoryReset method to IIpMemoryStore, and freeze api." into qt-dev
am: 39af0412 -s ours
am skip reason: change_id Ia11ecd33f528d01667b1baeb8671b7213a31eef5 with SHA1 91dd0631 is in history
Change-Id: Id1b567b214f483fb322f88390f6c9f9cb39713fd