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 am: 185a9dc9
Change-Id: Iefa16228540d21f951fcc4fa869a7facf47933c0