Merge changes from topic 'move-default-prop-v2' into oc-dev am: c6b07ec095  -s ours am: e908e98895
am: 66af1dcfd4

Change-Id: I54d3bff11bfb2724340c17c20ef57f6ac62e8ee1