Merge remote-tracking branch 'toybox/master' into HEAD am: c5a1dd459a am: e71581dbbc am: 3c1a8f8004
am: 7264722004

Change-Id: Ic5919b8379aa07a670d8d7445ef8368fc90fadfa