Merge "[dumpstate] fix -Wreturn-stack-address" am: 236f2f826d
am: ee6cd20ba1

Change-Id: I237ca7dca5df3818068fcc0a2578bbf029cd61e8