Merge remote-tracking branch \\\'toybox/master\\\' into HEAD am: c615678676 am: 017e8d53d7
am: 89692f5545

Change-Id: I40eb5c15a9f9863f8511536a548fe91e684060b8