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