Merge remote-tracking branch 'toybox/master' into HEAD am: 3233e2f9c1
am: 5aa96f14c1

Change-Id: I3ecf7f93f6eab051b753c65952f801c5645ac8c4