Merge remote-tracking branch 'toybox/master' into HEAD am: 64891a65fc
am: 8368cdd99f

Change-Id: Ie8954cd6ea1141878c4d9b5bd6ea4652d5933493