Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev am: 0f1e7ab1d3 -s ours am: fcd16254c6 -s ours
am: b9475468f5 -s ours
Change-Id: I08187baf768d319a768bf5f5f8d25759356c416e
This commit is contained in: