Modify name certificate dialog am: 19cba1ef10 am: d156dbb3cc am: 7f21f51f0d

Change-Id: I8328a35dc566aa449190a1f0f3acf4467125e9f2