Merge "Revert Snapshot appc, sdc - add aai directory"