Fixed few issues in SAO arm assemblies am: 489e8e68a3 am: a87cdb37ca
am: 040e65416c

Change-Id: I925b2a18d90caf44a519dcdafc13f1c92f1ab432