Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev
am: 0f1e7ab1d3  -s ours

Change-Id: Ic46aeb12f03e20c3379740934b4c80b228499124