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

Change-Id: I3b412a6662df6896f5f59503a64cf7d06c4a02b0