This reverts commit 1fa392b4b2. Reason for revert: <AoC enables the SA module> Change-Id: I4aaf967432b0254e3369608fa5a95cb2bd87079b
1fa392b4b2