Merge "Fix am start -S <package>"