[ Merge from http://go/wvgerrit/16406 ] This was detected by static analysis tool cppcheck. b/26348775 Change-Id: Icc6a55b9b4a1ffe882488ac069e3c3df2e796e91
[ Merge from http://go/wvgerrit/16406 ] This was detected by static analysis tool cppcheck. b/26348775 Change-Id: Icc6a55b9b4a1ffe882488ac069e3c3df2e796e91