Merge changes from topic 'move-default-prop-v2' into oc-dev am: c6b07ec095  -s ours
am: 6bb4667f47

Change-Id: Iec925c2bad6223088ea9662b6a7cb8263d357f08