[automerger skipped] Merge "Use compat flags to reflect the current status of...

[automerger skipped] Merge "Use compat flags to reflect the current status of legacy storage." into rvc-dev am: 6838c0ef am: 60d85a42 am: 91b5aafd am: f9b2b1d2 -s ours am: 67efc320 -s ours

am skip reason: Change-Id Id53da8f8783455038bad101e6ac50ba66b595012 with SHA-1 3a6027c0 is in history

Change-Id: Iabdebfb6ded8049efcc790af6d1008edab132f72