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

Change-Id: I3ecf0ecdf20bb61bda76fff547f920040ded47d6