This reverts commit b68bbcdd. Reason for revert: <AoC with SA module merged> Change-Id: Ic9ba6814c6c6e058198eab71eeb35ff267e7f599