Merge "Add a NOLINT for the memory leak we added" am: 10f62351eb
am: 4e3ae2cbfa

Change-Id: I32d7a736428f38c68ccf90947841732eaae4c224