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

Change-Id: Ica33178ed47d877d6ab723a42dce032456e15201