Merge "Update API naming to follow style guide." into lmp-dev