Merge "Move dumpstate to calling getprop."
am: 16401044cb

Change-Id: Ic55dcb53917eb7a885bf32532e36b08354a1f0f0