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

Change-Id: Ifca613992ddca0f17241d8007fb2bb344b61b034