Merge "Persist package's test-only flag and always use it" into nyc-mr1-dev am: 3304f950bd
am: 1c908fc677

Change-Id: Idf0e54bd7f479a3ccce23509635e9816890b5551