added spirit specific commits

Change-Id: I682233eb0245d5afd5fec25d97eaa096795669b4