Merge "Schematize Contacts system properties" am: 09332c2c14
am: e65fe873b8

Change-Id: I9e46d821c83e9db781a518f03ac7078d915afa58
tree: a8a79a29e6d5a32651e518c6c7ff73b19d7074c5
  1. srcs/
  2. OWNERS