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

Change-Id: I13c4cac958178bd70451b63f2a6b92015b801543