Merge changes from topic "presubmit-am-97bf65cf14104594ac79bcb5f507f817" into udc-dev-plus-aosp am: 92cae06bb3 am: a437e4eb02
Original change: undetermined
Change-Id: Iddfed8a79c94c744953cace2411850e010b2020d
Signed-off-by: Automerger Merge Worker <[email protected]>