Merge "Fix some issues caught via a static analyzer" into nyc-support-25.2-dev
am: 725ce5fa42

Change-Id: I962843580a9d3b46d8aa37f9f4facb74c7ca8d2d