Updated Device info strings

Change-Id: I4498cb566d36583c64c5199e64c099dec9034fa4