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

Change-Id: Ib8503fccf2aaef7ba98c1887b2f96651fbead68a