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

Original change: undetermined

Change-Id: I7006965da127beb7fd4cef3467756a178753c25b