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

Change-Id: I9b750104ab4615c5a3ea16c822d98e54dcd6bb14