Merge "Merge "Merge "Replace data source with data reader" into rvc-dev am:...
Merge "Merge "Merge "Replace data source with data reader" into rvc-dev am: edaedb06" into rvc-dev-plus-aosp am: 3c3d74ee" into rvc-d1-dev-plus-aosp am: f23f3ae2
Change-Id: Id26731c0c8883f28bf0dae86fe3be75c9ff53a81