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

* commit '01e307d4613a34cdbc9940a6f134fac0f658a722':
  Silence clang static analyzer warnings

Change-Id: Ia1e6d217dbbc7e0294413c5f35de027c2f23de3d