Merge "wifi: jarjar ipmemorystore interfaces" into rvc-dev am: 83e9ba45a4 am: 6b40a3695e

Change-Id: I8ac1de5f79896803df5bb70a430560182687757c