Merge remote-tracking branch \'toybox/master\' into HEAD
am: c615678676

Change-Id: I9e2998e71daa88eddf99889016fe899be695ce15