Merge remote-tracking branch 'toybox/master' into HEAD am: f2fa082e9f am: f291c6ce19 am: 5817c41cd2
am: 15e4f3437b

Change-Id: Idc5dc25b7865a7c9a5b36434555458e8292eee6c