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: 4d0e5463
Change-Id: I72e391c1a2e16712904a1c2da58e0d9bfb822601