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

Change-Id: Icfd0f2b134d7de95653ec2da2356ce312240a2d9