DO NOT MERGE: Check provider access for content changes. am: c813f5da am: 2b7584f5 am: d8ee1d0f am: b1551069 -s ours Change-Id: I128c5baee4f0f4d754467f4f718c5d55c0bc7020