Use 'self' in a couple of places, protects from refactors

Change-Id: Ibcf26362db63f1f4d16546bf0a6db8d97b22a97f
Merge "Use 'self' in a couple of places, protects from refactors"