Merge \\\"Lose top to toybox.\\\" am: 0f5b6c160c am: 0e0ce6ca6c
am: e26d1bd6cd

Change-Id: I0e0f24e9410f0031f68a55ea08ffb939d096e69b