Merge remote-tracking branch 'toybox/master' into HEAD am: fe3d63b269 am: 21b59f15b6
am: 3622386f99

Change-Id: Iee1ef5cb9ebea90fde424529700c23fb45651092