Merge "Fix crash in IntentForwarderActivity" into rvc-dev am: f9a02be5 am: 25d9d08a am: c691919a am: 16ee4e15 Change-Id: I886cd0e0a5304fa678635faf2f5fb2747220cba6