Merge remote-tracking branch \\\'toybox/master\\\' into HEAD am: 650711a6c9 am: db30f8e690
am: d8fe326537

Change-Id: Ic4a5d03482d08523bbf4d7522f3d12ec3e532229