Merge remote-tracking branch 'toybox/master' into HEAD am: 7c3d7b1386
am: 4cf3273234

Change-Id: I228f044a87c86b6ff00b0adef1297e73b1a1d618