Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce
am: 21d36dcc91

Change-Id: Ib2a788b0ebb819ca7b51a668ee9a746fd6c02767