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

Change-Id: Id9f5c4848f690814e49e38006344b8b31a80b835