Merge "Fix bug in IntentForwarderActivity" into rvc-dev am: d4d2427c am: 795db636 am: 8aad92e3 am: c7866e3e Change-Id: Ib8453a5da9bdd21e1301344ddf0b870dbc70462a