Merge remote-tracking branch 'toybox/master' into update am: fd67c867d2 am: 9ca15f063b am: b6ece7f09c

Original change: undetermined

Change-Id: I27f8d8a09d0064141406ad0df5e15739da021819