Merge "Move emulator check & save system properties access" into klp-modular-dev