Using self for static methods

Change-Id: Iea3e7a7bdde9c7ac4d2da39edbc3bff80a68e4c6
Merge "Using self for static methods"