Merge "Marking old sdk classes as deprecated" into emu-master-dev