Fix warnings from static analysis tools am: 1c9df71d7b am: 4abe3741dd am: 8453b0b883

Change-Id: I5ea454148bebfebe828c56e1b41d2847fbf39a20