Don't let users merge themselves

Change-Id: Idb92ec8bc0ab20d4c1036dfdad69cfb876a2813a
Merge "Don't let users merge themselves"