Merge "base: fix out of date documentation with PropertySet()" am: 44cabca1ef
am: f1b222b113

Change-Id: I9415b098ba8d1b2e02ee2db1d23ea7fcdb8ca4da