Merge changes from topic "presubmit-am-2c53fb43bdab4e97b09f15ae0a56fa78" into tm-dev
* changes:
[automerged blank] DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed 2p: 34fe38b0 2p: 301399bc
[automerge] DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed 2p: 34fe38b0
DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed