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

Change-Id: I71421bde9f207c772807240145914f65f0290a3d