This reverts commit bc4ad85d. Will retry when the updated launcher is in. Change-Id: I428dc93132615480df70aeca7977089af008c041