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

Change-Id: Ib32941ab4965e1554e8e7bdd228fa59f860451a1