allow internal storage format

Change-Id: If57d886a5da2b24b5daf08f6cae97dcf0cfe8a10