Merge "Merge "Replace data source with data reader" into rvc-dev am:...
Merge "Merge "Replace data source with data reader" into rvc-dev am: edaedb06 am: bd60b7b7" into rvc-d1-dev-plus-aosp am: c662ca79 am: a77e41a2
Change-Id: Id5f9e050f361788c3ce0dd591c0ed598549920e5