Merge "Merge "Replace data source with data reader" into rvc-dev am: edaedb06" into rvc-dev-plus-aosp