Condense a few more robot files

Change-Id: Iff41f5a56968b2b63e119683d6fd8ddc1e3abd9e