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: I5fb0084ab2085c2e7a78393457cc9167a0608058