Merge changes from topic "presubmit-am-97bf65cf14104594ac79bcb5f507f817" into udc-dev-plus-aosp am: 92cae06bb3 am: a437e4eb02 am: bdcd247c8d

Original change: undetermined

Change-Id: I85b2559cc6354b81a152f508e3cc9f744450f1e3
Signed-off-by: Automerger Merge Worker <[email protected]>