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

Change-Id: Iff9bf69c0fcb29aa6ba317be0e59481437f1a729