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

Change-Id: Ie744d7d4736301f157c34f797c31fdea6c7ced58