Merge "Silence clang static analyzer warnings" am: 01e307d
am: 47e177d

* commit '47e177d9fc12c8d6e58e2a8e50fabbb23a75c83f':
  Silence clang static analyzer warnings

Change-Id: Icc11d6db8007c383da7a852eaabebe2b5e3484d8