Fixed few issues in SAO arm assemblies am: 489e8e68
Harish Mahendrakar authored
am: a87cdb37

Change-Id: I09a40064a18140a38f00c160488911a4cef1aca8
040e6541