Blueprint: persistent-storage-for-api

Change-Id: I0e4d62f832556f58032104941bab1b9ecf6f0f5a
Merge "Blueprint: persistent-storage-for-api"