Merge "Update stable_properties.h"
am: 5e041a4f45

Change-Id: I980ffc21ac8ae0b99412befcc7a4249832666471