spirit rom specific changes

Change-Id: I64cba1ef1e8804fdd9b10375dec7d70764a6c4d5