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

Change-Id: Iec95d39df39df705f0d6b5bb90e268330cabf031