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

Change-Id: I9cce2034261ef982114be71cf5023b4b18b203c6