Fix warnings from static analysis tools am: 3595523fd8 am: 4fc3150d2b am: bf1094f552

Change-Id: I42517aa10521cb528794eadd29c9bc82491d4145