Android VTS 8.0 Release 2 (4339158)
Merge "Don't build NetworkRecommendation." into oc-dev