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

Change-Id: Icf6feeb41709606a8144b2e50aebe7a327e6e183