Merge remote-tracking branch 'toybox/master' into HEAD am: e64d3fbcfc am: 5595094915
am: 6650f7bed0

Change-Id: Ia7b7c54cb57ec62f0817b67a12c9ac4c20f7eacf