[INTERNAL] m.InputBase: minor cleanup (re-ordering)

Change-Id: I64d3a6dd5d62402c83c20c12c2d6837139f7f7d4
Merge "[INTERNAL] m.InputBase: minor cleanup (re-ordering)"