Merge remote-tracking branch 'toybox/master' into HEAD am: 7cfb1c6aab
am: b8ab605cff

Change-Id: Ief9a95c69136af126a2ba0393dc6e42898f23979