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

Change-Id: I8c35b2eec8cfc8c36d1dfadf6936df73d60d7593