Merge "Allow starting an Activity with a Context where possible" into nyc-mr1-dev am: d99dd41c78
am: 8722816fb8

Change-Id: I9b13a2856e529366ef411450c493856ee6ba487b