Merge remote-tracking branch 'toybox/master' into HEAD
am: d2ed825752

Change-Id: I8a6c0740b1be8d389004ab1f132ae255b021b7ad