Merge remote-tracking branch 'toybox/master' into HEAD
am: a379d5ee15

Change-Id: I2120b3a09b81b1aa593b6bf2b8b7a5192d1b5738