Merge "Silence a false positive memory leak warning."
am: 2560692961

Change-Id: I8c767d4235c754f89e5f53d73c79228a77620f13