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

Change-Id: I374f2c5d85af0a6f5a5c82906daa19f1c1624620