Merge "Tag brightness APIs with @SystemAPI"