[automerger] Fix 'potential memory leak' compiler warning. am: 37c428cd52 am: 2298edf58a am: 56b9616eb4

Change-Id: Ie85e27f5f7a16143bc27c6fed0138b38f4d32e96