Merge "Add documentation for *.sysprop" am: 1ae4c5b781 am: 912fabb3e3 am: b5856c3829
am: 0b08ec7040

Change-Id: I7bd95a88ea4873e7ac65c145f11b16a4d2417fb5