Merge changes from topic "remove_default_prop" am: 4e0bce688c

Change-Id: I6b1eb0ded64eda84b15f4c2a9e08d067f61142a4