Move methods where they belong. (cherry picked from commit 4e66db8d) Test: m Test: Device boots Change-Id: I805c6493078e960ff5b70d84dd93d2da6c7aa797