Merge "Fix calculation of Access Point Level."