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

Change-Id: I8be2d3e2afc46ba1ecc046e85c4c1262f30151a8