Merge "More light grey APIs."