Merge "Update stable_properties.h" am: 5e041a4f45 am: bd1670f24d
am: b02a7d11c4

Change-Id: Iacb9f353c7f0b8d0aa1c1e21c7a440dce58e6ca4