Doesn't need to be static

Change-Id: Id820ad0431ab8baff7eebfa658b46bb60190686f
Doesn't need to be static

Change-Id: I51f867d63a19757bdab4832e0bbcc29a32ab02ca
Merge "Doesn't need to be static"
Merge "Doesn't need to be static"