am 9dcb0fc7: Merge "Fix MultiAppStartupTest" into froyo

* commit '9dcb0fc7ceddd2d0250ea65d3351b7f1f99a0b54':
  Fix MultiAppStartupTest