Android CTS 6.0 release 3
Merge "Add new generated file."