Cherry pick for contentAllowed bug fix

Change-Id: Ib65897c642284bf5c2137a86c0cee9d36b107667
1 file changed