DO NOT MERGE. Check provider access for content changes. am: 91add43ae7
am: 792d49dfb5  -s ours

Change-Id: I50ab47cb03b65cc8be78c9a139561e4befbb1a95