Merge "Fixes that Contacts crashes when invoke Action.EDIT with profile uri" am: a0788b8109
am: 1cd5d11852

Change-Id: I64dc41fea9312a1412f512ea92182fee3829abcf