Merge "Schematize Contacts system properties" am: 559ec507e5 am: dc253383bd
am: 294406ed52

Change-Id: Id8c7b222ddfa158d052b921a3c7d0e62a202a4c4