[automerger skipped] preen should work independently with alwaysyes and alwaysno.
am: 77d7bbd209 -s ours
am skip reason: change_id I903e6bd88e23b711153f226b4288fae7d694a7b5 with SHA1 c9568a9ecc is in history

Change-Id: Id3cdafc69428f59a10b3c0b7f3facab6468681d8