Merge "Fix static analyzer warnings"
am: 19921b70fe

Change-Id: I7549ac79054ae4a3095d4e9f99bc365e22986955