DO NOT MERGE. Check provider access for content changes. am: 9b85862620  -s ours am: 9277cce7fa
am: a1d1ecbe05  -s ours

Change-Id: I6d4f8a29537e19545bf94a886aecea8ba05a6de7