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

Change-Id: Ia66a6a5ab4fd59772a5df71ede75227d353e5d25