Merge remote-tracking branch 'toybox/master' into HEAD am: 4b13881492 am: d21ae1a3cc
am: 8aa1c6e7f5

Change-Id: I84f2c89ff26a8005d28c72dd1316f54c6926bc92