Merge "Enable skipping validation by default." am: dc4985f43a

Change-Id: Ia73faddce7d5958613bd9c3a6490c39c7b1635d8