Merge "Schematize Telephony System Properties" am: 68ffb33f95 am: 6da5e2d4ba

Change-Id: I2f42b9c47841fba12b241209a96156abdd46c4b6