DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 am: 2b7584f5b1
am: d8ee1d0fcd

Change-Id: Ie8a8213307f8f85b00f2232cf047a8d8563bd859