Merge "Remove hardcoded os.name property."
am: 522a3fdf84

Change-Id: I40a3ad78fc463109bb4fcd5e0d312d1089a0972b