Merge "Populate only emulator specific properties into `ro.kernel.`"