Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo