Update changes for LegacyDroid