Merge remote-tracking branch 'toybox/master' into HEAD am: 991623dec1
am: 7d37c6e2ff

Change-Id: I9f26b6854b1a09638d3effc21b520dad8d921ebb