Merge remote-tracking branch 'toybox/master' into HEAD am: 4be718d62e am: c3095b883f am: 108c110427
am: 872460bdd5

Change-Id: I083783874143331e2fe46e1d8d6c439fe4db0df1