Merge "Fixes a stack-use-after-scope sanitizer issue" am: 82b51b7a2c am: c35a3dd799
am: bde80f6370

Change-Id: I22eaa11137d1a3b39548e4bb4454d21c62cda9b0