Merge "Fix static-analyzer warning."
am: 2fbf30d3fe

Change-Id: I1c297dfe786d92834cd4bd8b7d3177a7d9529074