Initial Commit For AOKP Compactibility