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

Change-Id: Iddc991f411caaf2701829c7c86059f787ef7b52c