Merge remote-tracking branch 'toybox/master' into HEAD am: 89bb822f3e am: 243a090d82
am: fb5520cd79

Change-Id: I9e0804711913d7a76494aa211dd2cf13acfbf1f0