Merge "Add device capabilities." am: 86316a4b42
am: 472d796ab2

Change-Id: I4837a521093dcc41bf7a3597d43c04e5f95c1c81