more fixes for s.a.c

Change-Id: I315a32c760d0a58999a5c76b81bc5b9be49ad7f4
1 file changed