Merge "Silence a use-after-free warning from the analyzer" am: 8c853c43cc am: 584853bdb0
am: 84b998f437

Change-Id: I3136eda15e1fb1464d398a259b0482a1bdba42d0