Merge remote-tracking branch 'toybox/master' into HEAD am: b62e8ff3da
am: 63a7993a8f

Change-Id: I9140de37d50dd91ac8798367307dbfa67b9a23ba