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

Change-Id: Ie6ccd88e6c45ea117a9b8c057054b7a732acb969