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