Merge "Fix clang static analyzer warnings." am: 411414c916 am: c95b45c72f
am: 37146b7b02

Change-Id: I80d0a661cfa8da9d19609dffe7beb9688d82535a