[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: cbcc67fe -s ours
am skip reason: change_id Ia11ecd33f528d01667b1baeb8671b7213a31eef5 with SHA1 42ea026a is in history
Change-Id: If9b2b45a37325b950a133645c8a1f7a3595fd14f