Merge change 10712

* changes:
  Clarify use of InputType flags