[automerger skipped] Merge "Enable skipping validation by default." am:...

[automerger skipped] Merge "Enable skipping validation by default." am: dc4985f4 am: 6c41f0ab -s ours am: bec8dea1 -s ours

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

Change-Id: Ib8580c23e53700b8f63bf1be7a9908262d8a0cb7