Merge "Fix static analyzer warnings" am: f45cf4bfb3 am: 0035f8b5eb
am: 5cf22fd20d

Change-Id: Id5698b426667dc43fd50ec94ef3206d3f5e13d3e