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

Change-Id: I4e24182b8e7f3955d359b38d5ff62af1c44ce423