Merge remote-tracking branch 'toybox/master' into HEAD am: d94bd8e917 am: db6c38177a am: c8e7472945
am: 9ad4b73c95

Change-Id: Ic382b27a6cdc81157dcc6e0dee7a322b6f035109