[automerger skipped] Fix warnings from static analysis tools am: 1c9df71d7b am: 4abe3741dd -s ours

am skip reason: Change-Id I8932afa39eb93aaf7cbbe2320e1071bf5b450735 with SHA-1 3595523fd8 is in history

Change-Id: I9749b505a5c640a1bfd2a6cf568689b6644159b7