Merge remote-tracking branch 'toybox/master' into HEAD am: 11385503ee
am: 4077f75055

Change-Id: Ia1136cf64257e0bbe11cafbee5cae87f9bea8265