Merge "Fix dumpstate tests"
am: 714761d2bd

Change-Id: Icb76e7fefbdae2157f1e6725bf3f6055371db43e