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

Change-Id: Ia0eec74df6335115c3e40302bc521efcf29539ac