DO NOT MERGE Append .deviceinfo to extended device info json file names

Change-Id: If42bc6691854a6f976faeacdcabf39481c48ebef
3 files changed