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

Change-Id: I4793f586f8082bce8e59e002bc6fea83e663aa9d