Merge "Fix static analyzer complaints" am: a3bde81205 am: 3e0a8b1d2b
am: c6c395b6b1

Change-Id: I6b2e0d2f2aa60b347699e7149a0c2af3ea0f6c93