Make sure we mark Plots in use for all regenerate cases
am: 5b3adf422c

Change-Id: I3529d709506f15c61a6544f6a893a003ec71aa97