Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd8 am: 41433459 am: 26e69188 Change-Id: I8b1bf2889bface1c6d8aad7c92b55c301059d6f5