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

Change-Id: I99f838d3ed6589433a5ec2246f7c51bc3b43b102