DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9
am: bdfb26ac3b

Change-Id: I93ab9555383689078ae6c08534619e8f38a47aaf