Simon's changes

Change-Id: Ieee3c051b9b4bc949262ecbc44e1db2ad3bebe38
2 files changed