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

Change-Id: I566cc4b5a8a9b41c3298492ae547e90d764257ac