Merge "Remove logspam for empty remote device properties" am: 7c358a3c47 am: 8df88eda5d
am: 3b786576e2

Change-Id: If0a6d218ea12b2c70c2099fbf31b709d62c933ab