Merge "RemoteDevicesTest testSendUunidIntent"
am: 80960e03e3

Change-Id: Ibbd7bcfb43cb1a7cd11415fcd0f208079be16336