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

Change-Id: Ied08b054e6764e0802e21bd81b96b8ce124ad6c5