Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1  -s ours am: f1085f2dc8
am: c130d7fd5e

Change-Id: I15e9c5f864ec67c8bf5901fcc46abe0c7b362a6e