Merge remote-tracking branch 'toybox/master' into HEAD am: b02120dad8 am: 7f1d01238d
am: ffcd050779

Change-Id: I9712e269013d40f33546584e35dbfb528c5e492d