Merge \\"No need for dumpstate to explicitly reference \\'toybox\\'...\\" am: c1c06a7d6b
am: b660711d76

Change-Id: I09b62f9faa6c72e804a9c3199b518cd3c5edb676