Merge "SDK doc change: Misc fixes." into eclair