[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 skip reason: Change-Id Id53da8f8783455038bad101e6ac50ba66b595012 with SHA-1 3a6027c0 is in history

Change-Id: I80163f5b481770e1b02d3e7338c722775f478f07