Merge "Fix ContactEditorActivity aliases" into oc-dev
am: a98d1c44cf

Change-Id: Iae65333d79e1f9f9611506e41ee03f5328c3fa71