Merge "Clarify comment for DEVICE_PRIVATE_BASE" into main