Support launching the app using the package name. Remove the unused variables. b/33226470 Change-Id: I5b3829912782a9fc0c8f09cbd6fa9ee4b5b35314 (cherry picked from commit a00259f4)