Merge "Schematize Contacts system properties"
am: 559ec507e5

Change-Id: I890ae4ec48fb6f102d56a3e634b329c9ab042414