Merge "Fix bug in IntentForwarderActivity" into rvc-dev am: d4d2427c01 am: 795db636b9 am: 8aad92e32b

Change-Id: Ie2cb41cb21119849e2148dbf54b79c16da46ed40