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

Change-Id: I43405bde0af62697cc7947f4d9320201090b53a8