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