Merge "Use compat flags to reflect the current status of legacy storage." into rvc-dev am: 6838c0ef am: 60d85a42 Change-Id: I19419b423389d1ea45e62973fa1b7addc8dd64c1