Merge "Fix static analyzer warnings"
am: f45cf4bfb3

Change-Id: I14325b5d35418f06bc40cf1110659e23bec08b46