Merge remote-tracking branch 'toybox/master' into HEAD am: 7cfb1c6aab am: b8ab605cff am: 95049d0f73
am: c02f8efaa4

Change-Id: I34833824fc8a61878664e9d73ea3053d0d6d2798