Merge Input Changes from CM

Change-Id: I8feccd774f61b5001c3b0d27de87cd8a9602e2e1