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

Change-Id: I93f6558cf57b3adb8b965a96e11d7d7efe8da749