Merge remote-tracking branch 'toybox/master' into HEAD am: 991623dec1 am: 7d37c6e2ff
am: 079cc30a4c

Change-Id: I4e322b3e376c31795a378672df5f9b9e4c7c0240