Merge "Merge \\"Make Activity.getReferrer tolerate custom Parcelables in intents\\" into nyc-dev am: 7a37f894 am: fb310f6a" into nyc-mr1-dev-plus-aosp