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

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

Change-Id: Ic02b7ec6da8af48cc6e1e552a3891c07006a27a0