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

Change-Id: Iec0fb7ff53c7e22a9d4d74e85222fddc7bd61375