Merge "Fix return value of AccessPoint.updateMetered()"