Rearranged device-props list for readability

Change-Id: I4b060a60108839a63c9230b87cf0d457cde5a88f