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: d78c014f am: 38ffb936 am: 0819a647
Change-Id: I64667fce9008a55efe51ce97229a553cb7fb5840