[automerger skipped] Merge "Enable skipping validation by default." am: dc4985f43a am: 6c41f0ab09 -s ours am: bec8dea1d5 -s ours am: 46562968f1 -s ours

am skip reason: Change-Id I07b087d731ed1661e5b0c51407ea3003769a3fd9 with SHA-1 57b574e267 is in history

Change-Id: Ie8bf2381503d091ef8b10260296fdc2c2350bf70