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

Change-Id: Ib03bd7a56eb5b3df5734b49dce8d1b037ce0aa6f