Merge "SF: Use content detection flag to protect the content detection policy"...
Merge "SF: Use content detection flag to protect the content detection policy" into rvc-dev am: 7ed9b006 am: 521babf7 am: 31040db2 am: 5b775c33
Change-Id: I2726d9026b4528e4c6549ef9a4fd6bcf7a1e650c