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

Change-Id: I47fd0774c077c12ec30126f081c142bf5e40aabb