Merge remote-tracking branch 'toybox/master' into HEAD am: f353b240a5 am: 66859184e5
am: 86fb74fe51

Change-Id: I915bb8c5ee24107acedc88cca27a5bd7da9dfa86