Don't use this use self to avoid selfies

Follow up to 3f005598

Change-Id: I176571e586093d4150c0a81a68530b4cf2808909
Merge "Don't use this use self to avoid selfies"