Fix build and reorder methods to match ec6a447c86b03f5896fdb717de530c8abf8887f9

Change-Id: I39ee2864eda489bf0e485ea96d30e56b29500865
1 file changed