Merge "Fix static analyzer warning" am: 80b99c23b0 am: ea5adde769
am: c77ee43e71

Change-Id: I63c2e8874a84b442024007916f2c16565c4597a8