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

Original change: undetermined

Change-Id: I152681fed90b33a6e663a50df36397454fbca8e8