Merge "preen should work independently with alwaysyes and alwaysno." am: d5a9a27c78
am: 0dc29be0f5

Change-Id: I930a5667f539cff1d32d6444e46ea114c002a424