Merge remote-tracking branch 'toybox/master' into HEAD am: b5517d09b2 am: 0ab6910887
am: 671339863b

Change-Id: If03af1a137e7f7ce154658b73ad2189e8d698dcc