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

Change-Id: I27e69f3d32e1ac5fedab69d9b12e20f06fc0561b