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

Change-Id: I7904c300b0edb08ae4371472c8ea8df8be269e2e