am a1cdf279: am 89f74cf6: am 4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo