Bug: 113043444 Test: builds and verified against Launcher code Change-Id: Ie6c9b9ffb5439c82acb59a60f9185ec445e26e3f