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