Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce am: 21d36dcc91 am: 26450476b8
am: d7e0fab45c  -s ours

Change-Id: Ibaa14fb3ee89c5ca61e603c9edad5b11ddd0d2a8