[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: 418f94f6 -s ours am: d72860da -s ours

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

Change-Id: Ib70a9154b5ec6d1c704720ddf28f04c656737638