Merge "Fix package names of View Ids in cts test." into nyc-dev