Merge "[nit] Fix typo in properties.h"
am: ded663c231

Change-Id: If7edd9aa3b06feeebf35585b53313b1b3b0ebf8e