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

Change-Id: I1b3a5c7aed8a2930ed98c81b1c2c391769d87fe5