Merge "Silence a false positive memory leak warning." am: 2560692961 am: 66287f6830 am: 642dc0395c
am: 06b066c57b

Change-Id: I25471635e966bf0c6a2c7d6e65c44677d8a456b1