Merge "Match comment to the new reality." into dalvik-dev