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

Change-Id: I1d4831bc70b8874e66583f4a130b3a711c24b019