Override package private methods to make them public for tests
am: 9290baf2c1

Change-Id: I2fb2295cebeb86630f871f16e842eb6e25bcad53