Merge remote-tracking branch 'toybox/master' into HEAD am: 4cce9b0f49 am: b70edb5cc9
am: e61df5503f

Change-Id: Ia22bdc60961bedb040de4c8b6c8dca576e58b4cd