Merge "Fix a static-analyzer warning." am: 63b4f6f5db
am: ea4423b181

Change-Id: I47de526a03bed05c4f69a89ec3ed2403a7e3b536