2378ea76d4
Moved some capabilities to properties which seemed appropriate. Bug: 20160395 Change-Id: Iacef4365822e5c3e50f0c41a501bf295c22055f1