Fix regression wherein correct activity flags weren't being set

Bug 18580158

Change-Id: I793faa7b5c85977a75ce4bc591cde90643442bb7
1 file changed