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

Change-Id: I5625fb263d54f107a5b630037811c4d0d701ba86