Merge "Skip Validate am: 11ec393689 am: a7b0e2785b" into oc-dr1-dev-plus-aosp
am: 1260bdb91d

Change-Id: Ie8b2d0e40b503f2138aa11fdfbffafbab838da3c