am c6ffc840: am 270c099f: Merge "Move emulator check & save system properties...
am c6ffc840: am 270c099f: Merge "Move emulator check & save system properties access" into klp-modular-dev
* commit 'c6ffc840':
Move emulator check & save system properties access