Merge commit '4b18ced6b5409bb9dd4013c06b9562b76a062939' into froyo-plus-aosp * commit '4b18ced6b5409bb9dd4013c06b9562b76a062939': Fix 2578016.
Merge commit '4b18ced6b5409bb9dd4013c06b9562b76a062939' into froyo-plus-aosp * commit '4b18ced6b5409bb9dd4013c06b9562b76a062939': Fix 2578016.