Merge commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c' into gingerbread-plus-aosp * commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c': Make sure we cache the sampleTable again if using the caching datasource.
Merge commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c' into gingerbread-plus-aosp * commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c': Make sure we cache the sampleTable again if using the caching datasource.