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 am: 3de5445d
Change-Id: I62b5fc4819e7e53d2e13e4ee719c755216fc8aea