Merge \\"Make Activity.getReferrer tolerate custom Parcelables in intents\\" into nyc-dev am: 7a37f894 am: fb310f6a Change-Id: I6b4120fcda293d0b4edae7ada60946c839675780