Persist package's test-only flag and always use it am: 46ea8e7f9d
am: c146ed5d26

Change-Id: Iac321d0eb9291c82a217b31c8410236db497048e