Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo