When submitting originally I'd missed unhiding these methods. Change-Id: I627a5ea0c8c29b6ddfe5b1c49f9c0789d5e86456
4e9c7e3f
5a60f058
13ab2c9f