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

Change-Id: I1295c7bd2156f093e702fd2196dc222bf43b2a48