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

Change-Id: Idfaf86880f92024492c22069a42540f523cf1b58