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

Change-Id: Ie9f1fdf7952d1b23af1412c5d7b6727995fa7632