Merge remote-tracking branch 'toybox/master' into HEAD am: 3233e2f9c1 am: 5aa96f14c1
am: 79cc039a81

Change-Id: I9766ab17027afb62730f63119cb9b186ca041008