Merge "Add extraneous neverallow rule to enforce attribute inclusion." into oc-dev