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