Merge "Add device capabilities." am: 86316a4b42 am: 472d796ab2
am: 291f3f305c  -s ours

Change-Id: Idc8d7903649d371624cf84edbb48d747ab7be7fe