Fix merge derp

* These methods are now public

Change-Id: I2eb1323d84e8c291d3587579782c7e765f195dad