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

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

Change-Id: I9ff2d1d51d3a646dab18e5d7eb9f98db0f407232