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

Change-Id: I9a899ec7891a9d14d934dfa306ee0a8c082d74a2