Merge "Fix a 'memory leak'" am: 38e7338d92 am: bc49cb8460
am: 02bf04ac01

Change-Id: I9113510f9fb0b46bf481a08009bd0c8a4080bc65