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

Change-Id: I73d1d0f9d370e1e85b0dc487c9574d397afda64d