Merge remote-tracking branch 'toybox/master' into HEAD am: d94bd8e917 am: db6c38177a
am: c8e7472945

Change-Id: I3d28b09f9df6ee737452fe68ba6d92568e3342e4