A temporary hack as some binaries are using these methods. Change-Id: I4ee63df82acf167ab5f434e63bd073e84e1fdf71