Merge "RESTRICT AUTOMERGE Ensure InputMessage is sanitized" into oreo-mr1-cts-dev