Merge remote-tracking branch 'toybox/master' into HEAD am: 5c2683335f
am: dc37511388

Change-Id: I864784f1389727df755293303600bf05e2795cbc