Merge "Add a NOLINT for the memory leak we added" am: 7b9ddc3770
am: 327eb40d70

Change-Id: I32d7a736428f38c68ccf90947841732eaae4c224