am 9dfc6971: am df7ccbc8: Merge "Fix 2656989. Clean up update to updated system applications." into froyo

Merge commit '9dfc6971631e306f6eec62b7c5f423ef52138b9c' into kraken

* commit '9dfc6971631e306f6eec62b7c5f423ef52138b9c':
  Fix 2656989. Clean up update to updated system applications.