Also tweak to follow changes in activity manager. Change-Id: Icd3fdff69dfc9e4c027d904ae95da3fb9bd65152
531bed61