Merge "avoid phone crash from exported activities" into nyc-mr1-dev
am: 7293f28f95

Change-Id: I863f2e30dd01e422726c3021f8868c93c471944d