Fix for doubled "self" reference.

Change-Id: I3b46ae4dc0d1154427f9dc8082b31e1eae412782
Merge "Fix for doubled "self" reference."