Merge \\\"Lose log to toybox.\\\" am: cfdd57eed8 am: a247e9ad47
am: e7130d28c7

Change-Id: Id9d1efbce9595603364149c32222445eb684fd43