Merge "Merge "support suw and post-suw cases for default app" am: 9fc8d99c76 am: ea55399ecc am: f2a5e432b0 am: 5ef316e34d"