Merge remote-tracking branch 'toybox/master' into HEAD am: 64279d4042 am: 0c31248456
am: bd918d8ef4

Change-Id: I3584ed12044c9f9151c8b9d16324ded9322fc685