Merge remote-tracking branch 'toybox/master' into HEAD am: acd101ac63 am: b11a72dc2d
am: 92163c0851

Change-Id: I77e8b94c47b83c1dca756cd285ec794dad5e4ac4