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

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

Change-Id: I68f61ba8d399a4310574eea36ddcb45bdb917b7f