Merge "fix warning: Use of memory after it is freed"
am: 05ef6c51f6

Change-Id: I5585c2e682356b76e009d5295eaf88390a9a31ca