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

Change-Id: Ie3d77ac3de6e1059eb3678996768f53db8c781dd