patch here to remove workaround in activity manager

Change-Id: Id88d9ed5b9f5de3ff7ec7f28fdecf2f2daf40ec4