S000: Even more edge tiles

Change-Id: I690b94c3e538619100b602e30536828f85a704f9