Merge "Doc change: update diff report 7-> 8" into froyo