Merge "Fix for  2579445 - Using the correct strings for accessing Intent extras now." into froyo