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
Change-Id: I85eddb9e18896232a792a40c3e2fdc112489ebe2