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

Change-Id: I3324d23a4e5fe5faa0149c2682bf97fae9bb2fcf