changes to fit hayabusa

Change-Id: I331be766bfb04d79f7e211918c012242bad5fa77
removed local test file

Change-Id: I4767f42989ed4a0dec168455dc08381842376de2