Merge "Clarify documentation on TEMP_NOT_METERED API"