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
Change-Id: Id0438751997e450b1c46c1f5b2cad546b61a2760