Merge "Add device capabilities."
am: 86316a4b42

Change-Id: I9aa51ecb8f3784e449b29358307646848ef3a309