Merge "Merge "Merge "Replace data source with data reader" into rvc-dev am: edaedb06ee" into rvc-dev-plus-aosp am: 3c3d74ee16" into rvc-d1-dev-plus-aosp