Merge "Fix "use of memory after freed" warning." am: 3f5160cadc am: db5075c9db
am: 85d08b12e1

Change-Id: I8bf97ed0e72c92c93b4e86f0b2f660e3b71ac06e