Merge "Fix static analyzer warning"
am: 80b99c23b0

Change-Id: I514710d0708a32a7dbeb08d36a0bd050b6aceea4