Change requested properties to be Android ones where applicable
am: e8012038e0

Change-Id: I23ab7c0d6fbd04ee6718491545c83e85114a6712